(unexec): Account for possible padding before the old .bss

section.

diff --git a/src/unexelf.c b/src/unexelf.c
index 799052baf52506ef053900222bde7709416c04b5..341147a576de556a5b9ca267cd01c11536e42383 100644 (file)
--- a/src/unexelf.c
+++ b/src/unexelf.c
@@ -799,7 +799,9 @@ unexec (new_name, old_name, data_start, bss_start, entry_address)
   if (n < 0)
     fatal ("Couldn't find segment next to .bss in %s\n", old_name, 0);
 
-  NEW_PROGRAM_H (n).p_filesz += new_data2_size;
+  /* Make sure that the size includes any padding before the old .bss
+     section.  */
+  NEW_PROGRAM_H (n).p_filesz = new_bss_addr - NEW_PROGRAM_H (n).p_vaddr;
   NEW_PROGRAM_H (n).p_memsz = NEW_PROGRAM_H (n).p_filesz;
 
 #if 0 /* Maybe allow section after data2 - does this ever happen? */